Fix GH-12727: NumberFormatter constructor throws an exception on #12868
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
devnexen
force-pushed
the
ext_intl_locale_except
branch
2 times, most recently
from
a5840e8 to
4fd8ae4
Compare
Girgias
reviewed
Dec 5, 2023
ext/intl/formatter/formatter_main.c
Outdated
| @@ -63,6 +64,11 @@ static int numfmt_ctor(INTERNAL_FUNCTION_PARAMETERS, zend_error_handling *error_ | |||
| locale = intl_locale_get_default(); | |||
| } | |||
|
|
|||
| if (strlen(uloc_getISO3Language(locale)) == 0) { | |||
| zend_argument_value_error(1, "is invalid"); | |||
There was a problem hiding this comment.
I think it would be nice to show what the locale is to say that it is invalid. So maybe something like
Suggested change
| zend_argument_value_error(1, "is invalid"); | |
| zend_argument_value_error(1, " \"%s\" is invalid", locale); |
devnexen
force-pushed
the
ext_intl_locale_except
branch
from
908d199 to
cfef555
Compare
Girgias
reviewed
Dec 6, 2023
Comment on lines
116
to
117
| intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, "datefmt_create: invalid locale", 0); | ||
| return FAILURE; |
There was a problem hiding this comment.
Suggested change
| intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, "datefmt_create: invalid locale", 0); | |
| return FAILURE; | |
| zend_argument_value_error(1, "\"%s\" is invalid", locale); | |
| return FAILURE; |
Apply the OO error style to procedural?
invalid locale. Also re-establishing exception throwing on IntlDateFormatter constructor overwritten by accident most likely so postponing it for next major release.
devnexen
force-pushed
the
ext_intl_locale_except
branch
from
cfef555 to
a7b7bba
Compare
Girgias
approved these changes
Dec 6, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
invalid locale.
Also re-establishing exception throwing on IntlDateFormatter constructor overwritten by accident most likely so postponing it for next major release.